8c857b51a28d69540538469e8c81ecbf0063efe5,src/main/src/test/java/org/geoserver/security/impl/AbstractAuthorizationTest.java,AbstractAuthorizationTest,populateCatalog,#,349

Before Change


        expect(catalog.getLayerGroupByName(NULL_STRING, containerTreeB.getName())).andReturn(containerTreeB).anyTimes();
        expect(catalog.getLayerGroupByName(NULL_STRING, singleGroupC.getName())).andReturn(singleGroupC).anyTimes();
        expect(catalog.getLayerGroupByName(NULL_STRING, nestedContainerE.getName())).andReturn(nestedContainerE).anyTimes();
        expect(catalog.getLayerGroupByName("nurc", wsContainerD.getName())).andReturn(wsContainerD).anyTimes();
        expect(catalog.list(eq(LayerGroupInfo.class), anyObject(Filter.class))).andAnswer(() -> { 
            List<LayerGroupInfo> groups = catalog.getLayerGroups();
            Filter f = (Filter) EasyMock.getCurrentArguments()[1];

After Change


        expect(catalog.getStylesByWorkspace(toppWs)).andReturn(Arrays.asList(pointStyle, lineStyle)).anyTimes();
        expect(catalog.getStylesByWorkspace(nurcWs)).andReturn(Arrays.asList(pointStyle)).anyTimes();
        expect(catalog.getLayerGroups()).andReturn(layerGroups).anyTimes();
        for (LayerGroupInfo lg : layerGroups) {
            expect(catalog.getLayerGroup(lg.getId())).andReturn(lg).anyTimes();
            if(lg.getWorkspace() == null) {
                expect(catalog.getLayerGroupByName(lg.getName())).andReturn(lg).anyTimes();
                expect(catalog.getLayerGroupByName(NULL_STRING, lg.getName())).andReturn(lg).anyTimes();
            } else {
                expect(catalog.getLayerGroupByName(lg.getWorkspace(), lg.getName())).andReturn(lg).anyTimes();
                expect(catalog.getLayerGroupByName(lg.getWorkspace().getName(), lg.getName())).andReturn(lg).anyTimes();
            }
        }